Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 23 Oct 2011 05:04:03 +0000 (22:04 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 23 Oct 2011 05:04:03 +0000 (22:04 -0700)
commit90182be5e22e6d33b6b9093534671419ba94510b
tree00916b6c4d406cdf88159d37df84fd8772ddf68f
parent62e6411915283acb3ff0a314a9b9f3b62ab23c36
parent1091089de1bf4ac9799380196047378d5b0f4b00
Merge from trunk.